Attempting to fix #442