Bug fixed in latest commit