addressing #309