Take into account SpecLad's comments