ACF-49: Bug fixed