Note to self: fix this