Fixed known issues #3