implemented this change myself :P