Recompiled with 1.6 compatibility (issue #2)