Fixing #18 - pending verification