Attempt to fix #319.