Fixing figures problem