Should fix issue #3. Needs more testing.