added option to skip space check