Fix for bug introduced by merge (#26)