maybe this fixes the system tests?