Fix bugs completed problem

Fixes #71