Fix wrong if and prepare for release