Copy/Pasta bug fix, behavior for #3 implemented