final code fix