Fixed #5

Fixed #2
Fixed #1 (used another property instead)