Bug Fix: Serialize issue with selected shapes