added complex workaround