Should fix #1. Testing on another machine