Trying to fix (#59)