Attempting to resolve #230