Fixed bugs 173 and 174 in Boon