reverted bugfix that cause stranged behavior