Make proper check here