simpler version of the previous fix
2 files changed