Fixed bug introduces by previous commit / refit