And a bugfix here :P
Bugfix