I have a minor fix for the current bug though