Added a bug to the todo, there are a lot more bugs, but this one is currently pretty important