fixed that bug for real this time