BUG FIX: Properties corrected