fork from gdsl 1.7