 Related to #85 and #670