closes #30 (fix for previous commit)