This was the original commit from @Seldaek not sure about this. Maybe he has answer.