removed compilation bugs