Fixed some versus based bugs

stable release