Attempt 2
Fixed behavior