fixes #1019 #1020 FABRIC-1036