Fixed issues with picking color