Fixed Starred bug again