Fixing model properties

Should fix #99