#11 and #12 fix