Fixing #24