Reverted @turt2live's bug