First attempt at support for 1.7