Partially fix earlier comit