Fix stephen bug