Fixed problems with raw files