A less clever fix.