I think this fixes the problem