Even more simplified fix