BUG FIX: Properties corrected.