More fixes for issue #24