Attempting to fix #27