Trying to fix #239