Sample workaround

Workarounds #1