Made comilation work on non soliars too.