Fixes bug 1254 and bug 1247