Fix same error like PR #61

Please have a look at PR #61. This is a fix for the same error.