fixed stupid bugs due to wrong cut+paste