Fixes bug introduced by 2de962a. Applies to #26 and #27