#33 Bandaid fix, while working out proper solution