closes #24 (minor bug in the last fix)