quick fix to get basic functionality