continue fixing issue #25