hot fix with override method