move fix for bitbucket-ticket:11 into the parse functions