Attempt to fix #39!