Bug Fixes

The previous version (implemented on 1/3) does not return the correct
answer