Fixes DSC-728 and DSC-302