Fixed the 'W' problem