Fixed comodification issues