Fixed problem in propagating guards from init