Fixes standalone functionality