Fixed comaster bug