Adds 6.2 compatibility