Tricky fix to our problem