Fix #57, this better not break fabric:create this time