starting to fix this #126