Workaround to get it working on test