Back to rotp 1.6.1