continue fixing issue #27