fixed bug with Late Static Binding
refactorization