Fix Bitbucket dev #2253