First commit towards fixing issue nr. 2.