Fix bug for real this time