Issue #21 - Reworked select logic to finally fix this bug