Fix ugly bug