Fixed bug for real now