not sure if this is a bandaid or a definitive solution