Fixed ugly bug