Should fix Issue 5.