Fix for zero arg constructor