First step to 6.1 compatibility