Implement fix suggested by Wandenberg