#40 Fix the issue