13 friday Fix patch

@13-friday-fix-patch