Fixed 1.6 support

Still need to fix the new chat