fixed some laziness