#9 - removed not needed check