fixed living code bug