Added comparison workaround! Works