Attempting to resolve #103