Bugfix and Add test