could be fix for: #80