Properly fixed #47

Sorry for the double PR.