reverted some changes of monkey patch... still not working