question improved, bug fixed