fix long standing bug