fixing after debug