Replaced dirty fix with clean fix.