Removed redundant check and fixed a little bug with novoc