I agree with you ... this one is an ugly hack ... but we need to decide when/how we can start doing the [BB] refactoring ... because I think this will take us a lot of time