Fixes problem #2