Maybe fix #288