FIX: bug#12 on bitbucket