fixing El140084's mad code