Modified decompiler to fix #6