Restored default behavior
Updated demo