fixing double handling.