fixes #27, #26