Resolving code inconsistency. Fixes #10