Entropysel fix

Change-Id: I2dc1561b9d572ef2d29fee7d712f861d1f3c26c0