another logic fix..