gets ready for 1.8.1