Re-applying #9 manually

Re-applying #9 manually due to merging into wrong branch