Fixing #23 issues