fixed 1010 issue. not tested. app randomly freezes?