Focus on making it work on 1.9.3