[Untested] 1.4.5 compatibility
3.6.1