Fix for CompoundJS