Simpler fix for the bug