Organization bug fix

Fixes #24