Last commit still had a bug. fixed