Found a bug... fixing