Attempt to correct #24