Workaround for issue #69 on BitBucket