additional fixes related to #130
additional fixes related to #130

a-morales/kwm,akdor1154/kwm,akdor1154/kwm,a-morales/kwm,koekeishiya/kwm,cHoco/kwm,akdor1154/kwm,a-morales/kwm,cHoco/kwm,koekeishiya/kwm,cHoco/kwm,koekeishiya/kwm