I can't beleve how stupid this issue is. Fix #16