Should've looked deeper into this issue