Fixed my workaround