Fixed over looked bug