Another quick fix to #15