CMPlayer - fixes #924 and fixes #1186