fixing ... issues