Fixed deferred objects but they look a bit ugly