Fixed re#34