not ready to merge the branch yet, but i need this fix